348379 Commits

Author SHA1 Message Date
Stephan Bergmann
dd7b477e9d Access safe members directly
Change-Id: Ib1195f4704de845448e280fabbe40580de46a97d
2014-03-20 15:04:13 +01:00
Stephan Bergmann
4f843f2bc8 Use an osl::Mutex directly
Change-Id: Icb655df89fcb3c9dac0f25d0fdb5383d24914877
2014-03-20 15:04:13 +01:00
Stephan Bergmann
ed15977626 Access safe members directly
Change-Id: I184f6450dc436b37fefe6c6ca35f61296ec10dd6
2014-03-20 15:04:13 +01:00
Stephan Bergmann
9a110fff7d Use an osl::Mutex directly
Change-Id: I4f483efd13c099348f06094573c499858a8431ba
2014-03-20 15:04:12 +01:00
Stephan Bergmann
3d07d18a18 Use an osl::Mutex directly
Change-Id: I49b88214bca33add9f9ea3d81870d54e40c5255b
2014-03-20 15:04:12 +01:00
Stephan Bergmann
3f1d1539f6 Use an osl::Mutex directly
Change-Id: I3df1bcd733637db8d967809e9abb0d2775d58efb
2014-03-20 15:04:12 +01:00
Stephan Bergmann
9baa3cf73e Use an osl::Mutex directly
Change-Id: I22d6d17bbd6886733df645e4d217c6fd1d995929
2014-03-20 15:04:12 +01:00
Stephan Bergmann
3a94a46fc2 Access safe members directly
Change-Id: I8d145fcf3dbcb2436392ee01740255a460c610a6
2014-03-20 15:04:11 +01:00
Kohei Yoshida
5d4f525da7 Disable kernel pre-compilation for now.
Change-Id: I8ba765a4d89618f301572c5fd9931f86d87af10d
2014-03-20 09:54:57 -04:00
Kohei Yoshida
393068beec Some cosmetics.
Change-Id: I4825d94c58d8cfb245f110b7f46397c2724436a3
2014-03-20 09:50:43 -04:00
Tor Lillqvist
aa99ae09fb Avoid "AquaSalGraphics::copyArea() for non-layered graphics" message on iOS
It seems this comes from the code attempting to 'scroll' the 'frame'
window. With tiled rendering there is of course no real 'frame window'
that would be displayed and need to be scrolled, so just bypass that.

Unfortunately this had no effect on the Smart Art rendering artefacts.
I had hoped those messages were related to rendering of them, but no.

Change-Id: Id4624eb5c1d825a120ef48bd2ae424f147060d35
2014-03-20 15:29:57 +02:00
Miklos Vajna
6dfe9bc622 fdo#76316 make this test file more minimal
The export -> import part of this file took 72s on my machine, now it
takes 4s.

Change-Id: I693a922027a7285b5e967bbb2bcf8289728eae82
2014-03-20 14:09:57 +01:00
Jan-Marek Glogowski
c4e73335b4 Revert "CppunitTest_sw_ooxmlexport: disable failing check on Mac for now"
Re-enable the unit test with the fixed xPath expression.

This reverts commit 0e5f9958a57a68a3707db5b1eb9f82e0326327c1.

Conflicts:

	sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: Ibc848b2ae89b3fb7f009cd984d0ecc5fc165673a
Reviewed-on: https://gerrit.libreoffice.org/8679
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 12:50:55 +00:00
umeshkadam
3ff5af221e fdo#76312: LO crashes - endTableCell is called before StartTable.
- m_oldTableReference values were not being reset.
- A call for DocxAttributeOutput::switchHeaderFooter from
  DocxExport::WriteHeadersFooters would end up using the m_oldTableReference
  value saved by DocxAttributeOutput::EndParagraph, which is incorrect.
- Fixed this issue and added an UT for the same.

Change-Id: I5ac51c3449e78bd26389e93e0d733d429dcc6874
Reviewed-on: https://gerrit.libreoffice.org/8659
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 12:04:08 +00:00
Eike Rathke
273195cb0a stuff Excel enhanced protection read into ScTableProtection
Change-Id: I06db8f7466f5baddc55ea9cb117bb8a222de0c01
2014-03-20 13:03:35 +01:00
Eike Rathke
6daff4ed35 range list might be nil, who knows
Change-Id: Iee5554f1b51db0f6dc22ccbed743ae431bb895f6
2014-03-20 13:03:33 +01:00
Eike Rathke
9cee6a4563 added ScEnhancedProtection to ScTableProtection
Change-Id: Id6a444bd01873e30ea1522aaf3b951f4d5adc261
2014-03-20 13:03:33 +01:00
Miklos Vajna
56dd3c277a DocxAttributeOutput::EndStyles: avoid hardwired 4091
Change-Id: I637cec62eb6cf951cb3d7c9e83c896494d6e1701
2014-03-20 12:47:52 +01:00
Vinaya Mandke
7057d1c909 fdo#76101 [DOCX] Export: Limit no of styles in styles.xml
MS Office has an internal limitation of 4091 styles in styles.xml
and cannot load a .docx with more. However the documentation seems to allow
that. So if there are more styles, don't export those.

MS Office follows the same principle and repairs the corrupt document by
removing extra styles.

Change-Id: I20c8775ee9d697a6613be96eb01283844c1d78f5
Reviewed-on: https://gerrit.libreoffice.org/8653
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 11:34:36 +00:00
Christian M. Heller
370c292378 fdo#39468 Translate German Comments - shellio.cxx
Change-Id: I932440ae95a6e7599168e88e9a17686b67763247
Reviewed-on: https://gerrit.libreoffice.org/8667
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 11:26:12 +00:00
Christian M. Heller
a9db058c95 fdo#39468 Translate German Comments - iodetect.cxx
Change-Id: I45d81df485ff62417f94c01234c3ddc41b6f3c77
Reviewed-on: https://gerrit.libreoffice.org/8665
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 11:13:37 +00:00
Christian M. Heller
76358d0cd1 fdo#39468 Translate German Comments - fltini.cxx
Reviewed on:
	https://gerrit.libreoffice.org/8664

Change-Id: I719fe3266b80fd6e4da73729c74f3d606708b691
2014-03-20 12:04:31 +01:00
Christian M. Heller
6bc34153bc fdo#39468 Translate German Comments - docfact.cxx
Change-Id: Ib9ca82b1b5f19dff439cd3119781a5f025b45231
Reviewed-on: https://gerrit.libreoffice.org/8663
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 10:55:48 +00:00
Tor Lillqvist
1cc065d28d Assume bit count 8 is OK for the other constructors, too
Change-Id: I9245101f3affa495e8da545dccdeb6510e37f17c
2014-03-20 12:49:00 +02:00
Chris Sherlock
f3854df014 Handle altname in docx's fonttable.xml
We don't actually need to do anything with altname, so just break.

Change-Id: I4b20d762c730675acb79ea1a4f0c5c14e7b86752
Reviewed-on: https://gerrit.libreoffice.org/8616
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-20 10:45:55 +00:00
Jan-Marek Glogowski
a4f7298945 Fix assertXPath in testcase for fdo#76098
Change xPath as suggested by Luke Deller in
https://gerrit.libreoffice.org/#/c/8572/.

Change-Id: Ibcf2bc6cd2b35df501aeeaf143a3928603cf6038
2014-03-20 11:35:56 +01:00
Miklos Vajna
465730622e svx: speed up ObjectContactOfPageView in case there is nothing to display
Reviewed on:
	https://gerrit.libreoffice.org/8675

Change-Id: I8d797acb3ca9e2341c5db08b2fc409a3cd97635e
2014-03-20 11:23:28 +01:00
Stephan Bergmann
85f7ed1c74 Use an osl::Mutex directly
Change-Id: I2e2a7c380ca593ad957c3b0085d01971c843f172
2014-03-20 10:49:40 +01:00
Stephan Bergmann
8781cdcc5b Use an osl::Mutex directly
Change-Id: I5dc6e56bcbec5055da629d4dfda608f266191ef9
2014-03-20 10:49:40 +01:00
Stephan Bergmann
35c495fd78 Use an osl::Mutex directly
Change-Id: I4db0fa34e00364e38ae015d079fee551be7319b3
2014-03-20 10:49:39 +01:00
Stephan Bergmann
7f0a6e262f Use an osl::Mutex directly
Change-Id: I7131abdc2202f80f0e9600d04633bbd6078700bf
2014-03-20 10:49:39 +01:00
Stephan Bergmann
da9aaab596 Use an osl::Mutex directly
Change-Id: Ia0a0dfae4390ad8cd74520396ecfbd6ac03a5d6f
2014-03-20 10:49:39 +01:00
Jacobo Aragunde Pérez
306859babd ooxml: preserve dataBinding tag in SDT properties
SDT blocks can contain document properties, like the author. This is
done with the dataBinding tag inside sdtPr.

Added a resource definition to the ooxml model file, so the parser can
process this tag. The attributes are stored in the existing grab bag
used for other sdt properties and written back on export.

The code to write the SDT block in the exporter has been modified to
be able to extract the new tag from the grab bag and write it to the
document.

Added a unit test.

Change-Id: I18f35a61784eb0a03ab9ca2cc398ca0df289956c
2014-03-20 10:28:24 +01:00
Jacobo Aragunde Pérez
876f1cf9bf ooxml: Fix testSimpleSdts
Change-Id: Iefd8de05107c6e9ad1dec04711ee3fd8e4c05b17
2014-03-20 10:28:23 +01:00
Jacobo Aragunde Pérez
692fd14070 fdo#76327: only enclose the checkbox in the sdt block.
The exporter writes the sdt blocks enclosing an entire paragraph, but
that's not the proper behaviour in all cases. The documents that mix
checkboxes and text in the same paragraph export the text inside the
sdt box and that's incorrect.

We have added code to be able to write sdt blocks that enclose
paragraphs or text runs, depending on the type of block. We have
applied it to checkboxes now.

There are two sets of properties in DocxAttributeOutput that store
sdt properties for the text run and for the paragraph. We have
modified the method WriteParagraphSdt to be generic enough to support
both cases. To write the sdt block enclosing the text run we used
parser marks.

We have renamed the property id PROP_PARA_SDTPR to the more generic
name PROP_SDTPR.

Checkbox unit test was modified to match the new structure of the
generated document.

Change-Id: I81ffe0062e1a5f80fc4638f7ee454a9bc18e63ee
2014-03-20 10:28:23 +01:00
Jacobo Aragunde Pérez
f79f3e072c ooxml: import combobox sdt control
This patch modifies the importer to reuse the code that imports the
dropdown control and creates a combo box with it.

The only drawback is that the combobox tag is transformed into a
dropdownlist when exported back, but it doesn't seem to be an issue
from the point of view of the user.

Change-Id: I340d0cf02d8c5ea575ad4784a1242d2a3e9bd214
2014-03-20 10:28:23 +01:00
Jacobo Aragunde Pérez
64ad575674 ooxml: preserve checkbox sdt control
Checkbox controls in docx are implemented with a sdt block containing
the property w:14:checkbox, which has several child elements.

To implement the preservation of the field, we had to add several
tags to the ooxml model file. Notice they belong to namespace w14,
that's why we had to add a redundant definitions of CT_STRING,
ST_STRING and their actions. Then, we just used the existing
mechanisms on the importer and the exporter.

Finally, added a unit test.

TODO: the checkbox is preserved on export but it cannot be modified.
We should import it like we do for combo and date boxes.

Change-Id: I40f29b48ec24719c48482b9c8cff10176d1b188d
2014-03-20 10:28:22 +01:00
Jacobo Aragunde Pérez
de1f5cb2ad ooxml: preserve docPartList property in sdt blocks
This patch strictly reuses the code introduced at commit
55211e612d2cbed03dd81c039d07ea4e936c2804.

Change-Id: Ie9151c81c2cb63d0f4a320293b6e5d27f20d4043
2014-03-20 10:28:22 +01:00
Jan Holesovsky
53fc63e351 Don't introduce a huge if, return early instead.
Change-Id: Id24cfcd34355ed39f80baa9e7b90ab7705e852a2
2014-03-20 09:53:41 +01:00
Stephan Bergmann
6ac1712956 Use SolarMutexGuard directly
Change-Id: I4533504d110dadbabfc737f7ca56b88afcc8ef44
2014-03-20 09:48:23 +01:00
Stephan Bergmann
cfb4c8125a Use SolarMutexGuard directly
Change-Id: I58bb5ede9c59f16d556db3c1e2f254eeba1c8f7d
2014-03-20 09:48:23 +01:00
Stephan Bergmann
227e924bae Use SolarMutexGuard directly
(both users of PropertySetHelper use a SolarMutex-based ThreadHelpBase)

Change-Id: If542914bbf33a9e81f86d654498c2af04082f31d
2014-03-20 09:48:23 +01:00
Stephan Bergmann
6771778d2e Use SolarMutexGuard directly
Change-Id: If09abe4dd6191efa5f92bf3af7cc6e119f401ab8
2014-03-20 09:48:22 +01:00
Stephan Bergmann
67f3785650 Remove unused ThreadHelpBase base
Change-Id: I0e15184071fc2c1cb231ead98210d4a1654208e7
2014-03-20 09:48:22 +01:00
Stephan Bergmann
94f8a0e60b Use SolarMutexGuard directly
Change-Id: I4b245dd68bf032a1d74fb16b910dc952fd761781
2014-03-20 09:48:22 +01:00
Takeshi Abe
bbdf832d48 Avoid possible resource leaks by boost::scoped_array
Change-Id: I0da7f9621d2770f49a554fb97591d9cac0bde9be
2014-03-20 17:43:45 +09:00
Tor Lillqvist
0fe02d03ac Add a few cppu source files for debugging convenience
Change-Id: I9cad3f9f2a80f7915a5525855fcdf6fd5bb32d50
2014-03-20 10:10:43 +02:00
Tor Lillqvist
fc33829dcd Add some more source files for debugging convenience
Change-Id: I2cfb9dd31b76d230a4c8aadc5461b7601fbc63a4
2014-03-20 10:10:39 +02:00
Tor Lillqvist
8dcdee51cd Bypass the 'LibreOffice' executable and app for now
It hasn't worked since the switch to tiled rendering anyway, and we
use the 'TiledLibreOffice' app for testing now.

Change-Id: I8137b8390c020ec4e6826e40e9cda69810f8318f
2014-03-20 09:40:31 +02:00
Stephan Bergmann
296a42a104 -Werror,-Wunused-variable
Change-Id: I99678f9b0595b8d5adfe939a1bfae4f4f2e8454e
2014-03-20 08:29:33 +01:00