Commit Graph

82 Commits

Author SHA1 Message Date
Caolán McNamara
12e0102f39 coverity#1130446 Uncaught exception
Change-Id: I9225b4ffd507fa3d666862a55dae349c9a76e91d
2014-02-08 20:52:41 +00:00
Caolán McNamara
7106e437bc 1158273 Uncaught exception
Change-Id: I3983da2d585762d81446902a710e9a97c6354669
2014-01-25 12:28:07 +00:00
Caolán McNamara
c5135af60f coverity#1158443 Uninitialized pointer field
Change-Id: I1602678c24c1aeec60acee05801e7decc914560f
2014-01-23 16:16:43 +00:00
Caolán McNamara
be090d5a50 coverity#1158444 Uninitialized scalar field
Change-Id: I15f6c6288e2a951543702a15e777167f2240899e
2014-01-23 16:14:49 +00:00
Jan Holesovsky
c2c530da69 Introduce static inline cppu::acquire(), and make use of that.
This is much better approach compared to the callback function, as it allows
passing arguments to the c++ constructor directly, while still allowing some
additional initialization after having acquired the instance.

Change-Id: I5a0f981915dd58f1522ee6054e53a3550b29d624
2014-01-22 15:09:28 +01:00
Jan Holesovsky
f278397787 Change _get_implementation()'s not to do initialization directly.
Many of the initalizations (in eg. framework) have to be done on an
acquire()'d object, so instead of doing the initialization directly, return
the initialization member function back to the createInstance() /
createInstanceWithContext() / ... and perform the initialization there.

As a sideeffect, I belive the calling initialize() from servicemanager is not
that much a hack any more - whoever converts the implementation to be
constructor-base has the choice to provide the callback, or still initialize
through XInitialization, where the callback is preferred by servicemanager
when it exists.

Change-Id: I8a87b75c54c1441ca0f184967d31ff4902fc4081
2014-01-21 21:25:22 +01:00
Jan Holesovsky
306efefe22 Minimize the constructor functions to a bare minimum.
Most of the constructors are supposed to be only a call of

  new TheInstance(arguments)

or an equivalent; so let's just change the constructor caller accordingly, to
accept unacquired new instance.

If there are exceptions that need to do more heavy lifting, they do not have
to use the constructor feature, or there can be a wrapper for the real
implementation, doing the additional work in their (C++) constructor.

Change-Id: I035c378778aeda60d15af4e56ca3761c586d5ded
2014-01-20 17:37:40 +01:00
Matúš Kukan
73eca35b0a Unify ctor functions for component implementations.
There is no need to use different styles for writing the same thing.
It also makes it easier in future to use search & replace.
But of course, there are also some more complicated functions.

Change-Id: I773da20378af0e0d5a27689d3903df7063fb8ac0
2014-01-18 17:02:40 +01:00
Matúš Kukan
a700ce8e2b Unify ctor functions to have _get_implementation suffix.
Change-Id: I07fe0671d0633ef9480a4f3431df6a64c7902db8
2014-01-15 15:12:01 +01:00
Matúš Kukan
4337a0664f Use const& arguments parameter for ctor functions.
Change-Id: I19ce8bd1a23123ac9a62a7fc95cd54fea5315221
2014-01-15 08:51:27 +01:00
Michael Meeks
91570fc3f3 fastparser: avoid boost::optional where it is un-necessary.
boost::optional appears to show up rather heavily on many profiles.
We already use mnElementToken == DONTKNOW to flag / use these guys.

Change-Id: Ibf2b0167f259cc601da2fb9703e880b78e60886e
2014-01-14 15:52:11 +00:00
Stephan Bergmann
fb9470825c Use bool
Change-Id: Iae455f53f8317eecb8edc38d111c9ef7398a36fb
2014-01-10 17:11:48 +01:00
Tor Lillqvist
308fdfb1a9 WaE: C4101: 'e' : unreferenced local variable
Change-Id: I06c0f9dc742736f632ed9210ae954e0dc19ca19d
2014-01-03 11:54:30 +02:00
Caolán McNamara
c6aea0bac0 don't call top on an empty stack
Change-Id: Ibe4b4d3785535816b40d46fd0baa60f01e1f9d33
2013-12-31 19:48:17 +00:00
Michael Meeks
4754b8ac50 fastparser: avoid std::stack::top() - cache it's results.
amazingly std::stack::top() takes 146 pseudo-cycles to do not much,
so instead cache the result in a single pointer in lieu of burning
that code.

Change-Id: Ie326be47da6cbad0850e5f1026a1632bb840b6b8
2013-12-31 14:06:21 +00:00
Michael Meeks
838a6011c1 fastparser: move lclGetErrorMessage into the anonymous namespace.
Change-Id: I70e1597f917c2a8dedb5b38807dfde7ec05a1a39
2013-12-20 16:45:15 +00:00
Michael Meeks
169eb25c86 fastparser:: move Entity:: code into the anonymous namespace.
Change-Id: I564e35aa63e4c01cc1a0fb45f674dc1a2a0e89ec
2013-12-20 16:37:03 +00:00
Michael Meeks
59003de73e fastparser: fix load regression
Remove erroneous assert: maSavedException is indeed empty for
XML parser reported exceptions. Clean cut/paste code, and comment.

Change-Id: Ia538bcc87a7efcd079d3021e00ac4d2eb62f3e8d
2013-12-20 16:21:43 +00:00
Stephan Bergmann
ae3a0c8da5 Add .component <implementation constructor="..." feature
...to directly call constructor functions of ComponentContext-based C++
implementations of (non-single-instance) UNO services.  The case where these
calls would need to be bridged across different environments (e.g., from gcc3
to gcc3:affine) is not yet implemented.

bootstrap.component and expwrap.component are adapted accordingly as a proof-of-
concept (which had previously been adapted to use the prefix="direct" feature,
which may become unnecessary again in the end, depending on how to handle
single-instance services/singletons).  More to follow.

Change-Id: I18682d75bcd29d3d427e31331b4ce8161dbb846d
2013-12-19 08:48:56 +01:00
Stephan Bergmann
71f33636da Change from ServiceManager- to ComponentContext-based implementations
Change-Id: Iba701c520ad27925bb5e67697e22132b53160ab2
2013-12-18 11:13:58 +01:00
Matúš Kukan
291e846db9 sax: various clean up. Move _getFactory next to the implementation.
Use more anonymous namespaces, de-duplicate code, bin some comments.
Makes the library smaller.

Change-Id: Id0cefdcaa72a74741303fc27e36038488ef8b059
2013-12-18 07:15:48 +01:00
Marcos Paulo de Souza
eebc1e9a8a fdo#60698: Merge fastsax and sax_shared into expwrap
Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4
Reviewed-on: https://gerrit.libreoffice.org/6967
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2013-12-11 20:45:30 +00:00
Michael Stahl
b6785eb595 sax: stop using SAX_DLLIMPLEMENTATION for both sax and fastsax
Change-Id: I243ec20015beec6b98ee0af55eb7c387008f32f1
2013-12-03 13:29:35 +01:00
Markus Mohrhard
223fb84c0b no inheritance so no virtual needed
Change-Id: Ia6c481bbf5353db4c2801a53ae1455534c6978bd
2013-12-03 05:56:24 +01:00
Kohei Yoshida
4afa538b7b Hide the implementation.
Change-Id: Ibfd9bf626a40c3ec4eb18d09944e8943163595c8
2013-12-02 23:04:39 -05:00
Kohei Yoshida
532b2f4818 Add a means to check if a namespace exists.
Useful when we just need to check if the stream has a certain namespace
defined. Calling getNamespaceURL() may throw SAXException in such case.

Change-Id: Ib2b7b202492390158270d87bab95d1793c9d8a70
2013-12-02 19:32:28 -05:00
Kohei Yoshida
2130fd9d61 Move this header out into a public place.
Change-Id: I356b26947d1018276d8a9ff6012fdad3ca2c0fd8
2013-12-02 19:32:28 -05:00
Kohei Yoshida
8ef9d65177 Remove inline methods from the header.
Change-Id: Ie2cff194c1db5eaa992c4bcaaa06ec9a419d85a7
2013-12-02 19:32:28 -05:00
Kohei Yoshida
4ba42fc8df Move this out of the namespace scope.
Change-Id: I4aec1d45edb47ea16adaa8d2ac23340b8f421bae
2013-12-02 19:32:27 -05:00
Michael Meeks
d8db8ea918 fastparser: strncmp needs a length. 2013-11-26 17:39:26 +00:00
Stephan Bergmann
9eaf15563a Presumably wants to use strcmp
Change-Id: I978a692fbf464b476811b445b16c7e1b0eec9e25
2013-11-26 17:31:29 +01:00
Michael Meeks
30a8fbbf1b fastparser: special case xmlns more sensibly. 2013-11-26 17:33:44 +00:00
Michael Meeks
d7280af974 fastparser: Avoid copying all tokens into a sequence. 2013-11-26 17:33:44 +00:00
Michael Meeks
2d681ad020 fastparser: don't waste cycles churning reference counts. 2013-11-26 17:33:44 +00:00
Michael Meeks
b7a8fc5585 fastparser: avoid allocation and conversion of elementnames we don't need.
Change-Id: I4c09aaa12b53181e50662de2721d170c195c7c86
2013-11-23 10:03:05 +00:00
Michael Meeks
fc25afaa04 fastparser: accelerate value tokenisation as well.
Change-Id: I99a39e91c684adb1fc92cdb466477cfa90104961
2013-11-19 20:52:50 +00:00
Noel Grandin
d366c9b20e remove unnecessary sal_Unicode casts in various places
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
2013-11-14 08:17:32 +02:00
Marcos Paulo de Souza
da5449da0c fdo#54938: More uses of cppu::supportsService
Change-Id: Id6bed78d92eba52283a17ab3ca66e751c225e48d
Reviewed-on: https://gerrit.libreoffice.org/6423
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-25 08:07:04 +00:00
Tor Lillqvist
e2d061fe93 WaE: unreferenced local variable
Change-Id: I9783f03e656049b4f3b7f0a26a7ae626db5a13f6
2013-10-21 09:13:43 +03:00
Matúš Kukan
94f99a6bae sax: build fix: don't prefix enum values
Change-Id: I6f4eac6103821227bc72de8c3bb0fb89a7a8bc9d
2013-10-17 22:56:58 +02:00
Matúš Kukan
aeca826f34 fastparser: don't use multithreading for small documents
Determined by XInputStream::available().

Change-Id: I450f4796d9c072b395393582bfc3e1e7768e243b
2013-10-17 21:38:40 +02:00
Matúš Kukan
7aa35dcb43 fastparser: don't create temporary Events; use references to event list
Change-Id: I1e12fbeeb90d6020d0566d05fc0318082e1da5fc
2013-10-17 21:38:39 +02:00
Matúš Kukan
6f1a110a37 fastparser: reuse event lists if possible
Instead of allocating and freeing the memory all the time.

Change-Id: I53800abaca51d42d7d44a98fb271de7df7f90f58
2013-10-17 21:38:38 +02:00
Michael Meeks
902748b6ff fastparser: re-work locking, add high & low watermarks, change sizes etc.
Change-Id: I7fe1435addc6dce5a74a8411f7825cea331a5b3f
2013-10-17 21:38:38 +02:00
Matúš Kukan
9612bdbfa9 fastparser: implementation using two threads
Instead of calling methods directly, generate EventList - vector of
Events, where arguments for the callee are stored.

Change-Id: I227a0ef3038566664ac8f294770152c8b445997b
2013-10-17 21:38:38 +02:00
Michael Meeks
2df047bfd1 fastparser: cache default namespace token for ooxml.
Change-Id: Iee98ec92380d6d0404ab236e062ddbc2378cda43
2013-10-17 21:38:37 +02:00
Matúš Kukan
c293e73e8f FastAttributeList: avoid OStrings in attribute list; just use char buffer
Change-Id: I4879563fae3b85c68bbd1c4b260f9833848f4bda
2013-10-17 21:38:37 +02:00
Matúš Kukan
bc2d6ef106 fastparser: remove duplicated OString version methods
Also remove AttributeData and make the two for-cycles faster.

Change-Id: If0343992173bb333eee39c33bcb86acaa5a3d288
2013-10-17 21:38:36 +02:00
Matúš Kukan
03d76d034e fastparser: isolate calls to XFastContextHandler in Entity's methods
Unfortunately, we have to store maNamespace in two stacks.
One for future parser thread to compute tokens and one for
main thread calling XFastContextHandler.

Now we are prepared to implement multithreading.

Change-Id: I421b55afa2e9ea80142e6068c7a515d31913ba69
2013-10-17 21:38:35 +02:00
Matúš Kukan
bd4c869bbb fastparser: store mnNamespaceCount in another stack
This is preparation work for multithreading.
mnNamespaceCount will be handled in parser thread and the rest in main
thread.

Change-Id: I571026ea499f6876b8dafb4e1bdc56d1add649e5
2013-10-17 21:38:35 +02:00