705 Commits

Author SHA1 Message Date
Stephan Bergmann
fc9d23ff55 Reorganize defaultbootstrap so that typedescriptionprovider can use servicemgr
...instead of having to rely on the odd bootstrapInitialSF and explicit
loadSharedLibComponentFactory.

Change-Id: I2fb212024c483254da015db3af43d9002051dddc
2013-01-16 11:39:03 +01:00
Stephan Bergmann
aed1f0d5d5 Simplify defaultbootstrap.cxx
Change-Id: Ice206b1dabf8dbcad613f886574e737c039d2119
2013-01-16 11:39:02 +01:00
Stephan Bergmann
3250fad637 Extract servicemanager and typedescriptionprovider from defaultbootstrap
Change-Id: I94fe7e68c5a49e591a625e9bf62108acac69428d
2013-01-16 11:39:02 +01:00
Tor Lillqvist
392510d7e4 UNO components have the "lib" prefix only on Android
That they do is a leftover hack from before we started using the
DISABLE_DYNLOADING thing on Android, it isn't actually necessary any
more. Earlier when the UNO components were actually dynamic libraries
on Android (too, as on desktop OSes), they *had* to have names
starting with "lib" or they would be silently skipped when
packaging.

Change-Id: I11a4689f316e1ffb640a5c3110c63296d2833a84
2013-01-06 16:01:07 +02:00
Tor Lillqvist
d72a0b5c61 Check for __GNUC__ instead of GCC in sources
We still have checks for $(COM) being GCC or MSC in makefiles, of
course. But there is no reason to pass -D$(COM) to compilations.
Checking the built-in compiler-specific macros __GNUC__, _MSC_VER
(etc) is the right thing to do.

Change-Id: Ia961a29ba74e2c4977e5300a92318f38104c6592
2012-12-27 13:38:15 +02:00
Stephan Bergmann
0373964108 Remove support for XML .rdbs froom SimpleRegistry service again
...this was a transitional hack to get XML-format service.rdbs in.  Now that
registry-based bootstrap_InitialComponentContext is gone, XML-format .rdbs need
only be handled in cppuhelper/source/defaultbootstrap.cxx (so the
textualservices stuff once duplicated to there now effectively moved there).

Change-Id: Ifb93558768095c1b462fe4057ebf8724968cca77
2012-12-21 15:56:45 +01:00
Stephan Bergmann
f3051abde5 API CHANGE: Remove deprecated cppuhelper/servicefactory.hxx and Java equiv.
... com.sun.star.comp.helper.RegistryServiceFactory (juh.jar).  Superseded by
default bootstrap mechanisms.

An aborting stub for non-inline cppu::createRegistryServiceFactory is left in
cppuhelper/srouce/compat.cxx to avoid having to incompatibly change
cppuhelper/soruce/gcc3.map.

Change-Id: I590e50b8f57e86d4bb3e00d157c9e5907c02f267
2012-12-21 15:56:44 +01:00
Stephan Bergmann
b1a4afa3b4 Always have UNO_SERVICES/TYPES set in in-build uno ini file
...so that 16f856a5ca827602362692907dfcf287aa91602e "Adapt climaker to
cppu::bootstrap_InitialComponentContext removal" does not fail.  Starting uno
processes from within the build should thus use URE_MORE_SERVICES/TYPES now,
too.

Change-Id: I0a7cfacc804814a2688e54275ebc3e39540d307c
2012-12-20 14:58:13 +01:00
Stephan Bergmann
e3982fc537 API CHANGE: Remove deprecated cppuhelper/bootstrap.hxx functionality
cppu::createSimpleRegistry, cppu::createNestedRegistry, and
cppu::bootstrap_InitialComponentContext for registry-based type/service
information, superseded by cppu::defaultBootstrap_InitialComponentContext.

Aborting stubs for the three functions are left in cppuhelper/source/compat.cxx
to avoid having to incompatibly change cppuhelper/source/gcc3.map.

Change-Id: I8e714c021c246b15a6e6fb7f25d754dceff17c8a
2012-12-20 10:02:38 +01:00
Michael Meeks
c8a733079f cppuhelper: add compatible symbol for obsolete method. 2012-12-06 09:48:49 +00:00
Michael Meeks
9d7c1dcbbb re-base on ALv2 code. Includes:
Patches contributed by Ocke Janssen
   converted reportdesign.
   http://svn.apache.org/viewvc?view=revision&revision=1396797
   http://svn.apache.org/viewvc?view=revision&revision=1394326

   Patch 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
2012-12-06 09:12:57 +00:00
Michael Meeks
c95f6b679a remove obsolete stdidlclass. 2012-12-06 09:12:57 +00:00
Luboš Luňák
ce90f99a2d fixes for where fast string operator+ is not perfectly source compatible
Change-Id: I80af0399037e4f68113338139e7f2ad2400e65ab
2012-12-03 18:04:24 +01:00
Thorsten Behrens
66a175834c c++ API: use css alias in generated headers, adds global css decl
This changes all generated API headers (.hpp and .hdl) to use a
namespace alias 'css' instead of the pointlessly long com::sun::star

Makes the change in cppumaker & associated tools, adds a global
namespace alias definition in sal/types.h, and removes a kiloton
of local, now pointless-to-harmful versions of that alias from all
over the code.

Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
2012-11-30 14:36:36 +01:00
Lionel Elie Mamane
a28b4c1e3e Do not override the message of an underlying PropertyVetoException
Change-Id: I9c1026ad87f3031f1c56066ab24d23d3a6d8782b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-11-30 11:24:43 +01:00
Lionel Elie Mamane
8a5fddc656 Enhance error message when setting a CONSTRAINED property to Vetoed value
Change-Id: I8391c874723bddaabe2fde12f22d9f50a444d3df
2012-11-29 21:41:21 +01:00
Tor Lillqvist
faef84abca Do stay backward-compatible also in 4.0 and later for now
Change-Id: Ie8f2de8f11f8fec3a9f014bbcc46a506dfb3058d
2012-11-12 16:37:21 +02:00
Tor Lillqvist
d1006596f2 Update library names for DISABLE_DYNLOADING
Change-Id: I2b5e4abdceea25180c9caafabc49c22077016a05
2012-10-11 10:07:08 +03:00
Tor Lillqvist
97f27e2cda Include android-bootstrap.h for Android
Change-Id: I022f7d450f66e1ff0fb4e4aedfebc16b83ad32b9
2012-10-11 10:07:04 +03:00
Tor Lillqvist
3c4c117008 I want to see what unknown library is required always
Change-Id: I7e0eb7ba3be8ac2b70e6a56d84c1a890be0ba396
2012-10-09 11:41:31 +03:00
Tor Lillqvist
97593ae24a Handle lack of module loading/unloading API when DISABLE_DYNLOADING
There are basicically two classes of cases:

1) Where the code is for obscure historical reasons or what I see as
misguided "optimization" split into a more libraries than necessary,
and these then are loaded at run-time. Instead, just use direct
linking.

2) Where dynamic loading is part of the functionality offered to some
upper (scripting etc) layer, or where some system-specific non-LO
library is loaded dynamically, as it is not necessarily present on
end-user machines. Can't have such in the DISABLE_DYNLOADING case.

Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0
2012-10-07 07:59:15 +03:00
Stephan Bergmann
eff6d4e01b Version name/dependency cleanup towards 3.7
Change-Id: Ib5da7703bf48713093bc6a3380facafd0013e039
2012-10-04 11:33:43 +02:00
Tor Lillqvist
0c1553a86e Disable-dynloading updates to component list
Change-Id: Idf092958e46a2ad9d56541c90c5a2beb44baff48
2012-10-04 07:23:25 +03:00
Stephan Bergmann
d2092dc56b Keep null service manager throw a DeploymentException
...rather than a general RuntimeException, for consistency with existing service
ctor code.

Change-Id: Ia9ac14a1b5bcecb24394e7b9cade369f3f9303f0
2012-09-17 19:12:34 +02:00
Stephan Bergmann
543158edba Require XComponentContext.getServiceManager to throw instead of returning null
This is such a fatal error that there is probably no point in trying to handle
it, so allow to simplify client code by removing the requirement to check for a
null return value.

Simplified some client code accordingly (modules configmgr and ure, and the code
generated by cppumaker and javamaker).

Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
2012-09-17 16:59:53 +02:00
Norbert Thiebaud
195f17ee40 migrate some of the biggest consumer of osl_*InterlockedCount to osl_atomic
Change-Id: I0e6992afbeffaf3b993e6630fb396d93012890e0
Reviewed-on: https://gerrit.libreoffice.org/632
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-09-17 14:26:12 +00:00
Stephan Bergmann
2171077c0c Introduce cppu::supportsService helper, adapt some call-sites
...more to follow (easy hack?)

Change-Id: Icb02626495701a3905c124c7368b98c3258e91b2
2012-09-14 19:32:30 +02:00
Stephan Bergmann
35d474ff8c Fix removeRdbFiles (caused extension update to fail)
removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the
corresponding component (.so, .jar, etc.), but not the .rdb file.  So removing
an .rdb file silently failed to remove the corresponding implementations, so re-
installing a similar enough .rdb (as typically happens during extension update)
would fail due to duplicate implementation names.

Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
2012-08-24 17:18:28 +02:00
Stephan Bergmann
8caf1164ee Missing mutex lock
Change-Id: Ifddd6131c2e62057561d4b17eeda88568f6ccf7c
2012-08-10 14:35:04 +02:00
Stephan Bergmann
142d3ec875 Related fdo#52639: Do not destroy Implementations with mutex locked
Erasing from data_ member maps can destroy contained Implementations, which in
turn releases the UNO objects referenced from there, which in turn can cause
XComponents to dispose, which in turn can call arbitrary code, so must not be
done with rMutex locked.  Witness the backtrace at
<https://bugs.freedesktop.org/attachment.cgi?id=65142> linked from fdo#52639
(where this fix appears otherwise unrelated to that issue's main topic).

Change-Id: If55a3841b761ec1d9a0ef61fe54784426c4ee442
2012-08-09 17:44:14 +02:00
Stephan Bergmann
9fc870fc33 ServiceManager::createInstanceWithContext needs to honor given Context
...in loadImplementation (instead of using the context the ServiceManager itself
was created with).  Otherwise, the handcrafted context containing a fake
theJavaVirtualMachine singleton in install_vm_singleton
(javaunohelper/source/vm.cxx) would not be honored, so that if a Java process
bootstraps native (binary) UNO and from there tries to obtain that singleton, it
would erroneously try to instantiate another JVM instead of using the existing
one.  This was a regression introduced with the new ServiceManager and could be
witnessed by test-javanative in ure/source/uretest/Makefile failing.

Change-Id: I58cfbc8cdaea7ee4ab80fac728ea3e85676d69e1
2012-08-08 18:36:40 +02:00
Christophe JAILLET
0cba5e5d25 This look like the same as rLibName.endsWithIgnoreAsciiCase so kill it. Add missing { }
Untested as I don't have a working build environment yet.

Change-Id: I1988da8c07729eb99d3f53f71b8f950df29a7361
2012-07-13 16:36:04 +02:00
Stephan Bergmann
2e7702fb70 fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException
...as some client code catches just the former and thus fails now.  (This was a
regression introduced with the recent cppuhelper/source/defaultbootstrap.cxx.)

Change-Id: I8306797f8331d894ab4e7695478e3824e9f79197
2012-07-13 12:12:41 +02:00
Michael Meeks
b9042fad7c re-base on ALv2 code.
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21 15:00:05 +01:00
Tor Lillqvist
f79d5b9116 Unbreak stuff on iOS a bit after bootstrapping changes
Change-Id: I0d2ebfc9aa78a9fed057b853d54797a88218c587
2012-06-04 11:41:50 +03:00
Stephan Bergmann
5fd78feebe Revert "bootstrapping should elide duplicate .rdb paths in the configuration"
This reverts commit b162aec6254ab535cc5eb990b249f46aa8e79153, which increased
code complexity for no benefit (the dubious scenario it was introduced for
concerned duplicate service rdbs rather than type rdbs, anyway).
2012-06-01 10:10:07 +02:00
Stephan Bergmann
0951b76a00 Add "virtual" for consistency
Change-Id: I8ecc2edde553edbd80ca04e2f3d541c31f516211
2012-06-01 10:09:18 +02:00
Stephan Bergmann
c16d0dd846 fdo#49291 Postpone actual factory instantiation as long as possible
...see comment in ServiceManager::createContentEnumeration for a rationale.

Splitting ImplementationInfo out of Implementation has become necessary to avoid
circular references.

Change-Id: I29aef81ce78b9ab71e18663f8c7e6ca913c6a650
2012-06-01 09:59:49 +02:00
Takeshi Abe
3ac9b7af76 removed dead code
Change-Id: Ic70d66befc90450aeb276d53f6da7e81aef85478
2012-05-29 00:11:30 +09:00
Michael Meeks
b162aec625 bootstrapping should elide duplicate .rdb paths in the configuration 2012-05-22 11:35:36 +01:00
Michael Stahl
5729da18a1 fdo#42865: privatized unique empty string symbol:
Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
2012-05-18 16:33:19 +02:00
Stephan Bergmann
d8ade3ccf6 Added link to LanguageTool.oxt issue
Change-Id: Ifab63273b12963e748c9b937648b2079fcd0c796
2012-05-14 18:48:22 +02:00
Stephan Bergmann
3b1798a55b Work around extension factories not implementing XServiceInfo
...that would otherwise lead to "Bad insert element" failure during live-insertion.

Change-Id: I74f883c9b613f03256abb7be7657f25b418f821d
2012-05-14 18:20:30 +02:00
Thomas Arnhold
135c63c8f9 fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
2012-05-04 15:52:57 +02:00
Caolán McNamara
f5a414d242 WaE: simple minded MSVC2008 thinks s could be used uninitialized 2012-04-24 11:56:49 +01:00
Stephan Bergmann
015283bb50 Trying to parse legacy rdb as XML can cause InvalidRegistryException, too 2012-04-23 18:41:29 +02:00
Stephan Bergmann
0bbf79005a Do not fail for legacy rdb that only contains root key 2012-04-23 11:47:45 +02:00
Stephan Bergmann
18a9e9e844 Various clean up of previous commit 2012-04-20 23:37:14 +02:00
Stephan Bergmann
c2fd9b533c New cppu::defaultBootstrap_InitialComponentContext implementation
...that no longer uses XSimpleRegistry structures for the service data and thus
is potentially more performant.

* Registry-based functions from cppuhelper/bootstrap are deprecated now, client
  code should always use defaultBootstrap_InitialComponentContext.

* References to the obsolete UNO_WRITERDB have been removed.

* Some of the functions in cppuhelper/source that are used from multiple .cxx
  but had not been properly placed into .hxx have been cleaned up.

* css.lang.ServiceManager XSet insert/remove now support special
  sequence<NamedValue> to improve live deployment/removal of XML-based extension
  components data.

* 09524d410bbaad2a0b9b39811cb5cc16621b1396 "stoc: accelerate opening of multiple
  XML .rdb files in a directory" and its follow-up
  cb5c881a7f179391ee853f76e159254c97d776a3 "avoid using the new rdb reading
  logic for empty/non-existent directories" have been obsoleted by this change
  and have been reverted again.
2012-04-20 22:57:32 +02:00
Stephan Bergmann
a26c2ee3c9 Put create_bootstrap_macro_expander_factory properly into a header
...and fix the typo in its name.
2012-04-18 15:59:58 +02:00