[Libreoffice] Fwd: [For Review] merge of most vos-removal patches left. and little related housekeeping

Norbert Thiebaud nthiebaud at gmail.com
Sat Oct 16 22:53:26 PDT 2010


I've pushed the branch 'feature/vos-removal' for review
I have rebased against master Saturday morning GMT, with relatively
few conflict.

The resulting build passed a trivial 'smoketest' (openining a couple
of spreadsheet, text document ...)

I have NOT built against Win or MacOS... there are almost certainly
some oops for these platforms.
I'll appreciate very a much feedback from person that can build on
these targets.

There is still a little bit of vos left.... but the end is near.

For reviewers:
commit marked as 'merge of vosremoval-xxx' are meant to be
more-or-less a transcription of the original patch in dev300 with the
same name.
Most of these patches did not apply very well, actually for many of
them they mis-apply so badly that I just used the original patch
as a guide, without even bothering with trying to apply.

Along the way I did some re factoring around Guard on the SolarMutex.

Few modules had there own variation of a Guard class for the
SolarMutex, some other used directly

vos:OGuard aGuard(Application::GetSolarMutex())

Now for these use-pattern I mostly use

::SolarMutexGuard aGuard


Below is the relevant git-log

n_th at tpa10 ~/git/oo/build/clone/libs-gui (feature/vos-removal)$ g log
master...HEAD
===== artwork =====
===== base =====
commit 042d9be3f340fb68407edc23eda8275da730e9bd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:13:32 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit e10b3f985f9ecc9043ba0b3829a178931bae66d3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:22:54 2010 -0500

   merge vosremoval-reference.diff

commit 11628553d86d9223f2d56a0a420627c529da309a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:00:34 2010 -0500

   repl OClearableGuard(SolarMutex) by SolarMutexGuard as none needed clear()

   Four site used a Clearbale Guard on the SolarMutex, but non of these site
   actually needed to clear the Guard, so SolarMutexGuard fit nicely

commit d502d4f6a6e08e72b1a8f22b55b23c74354f653b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 01:38:41 2010 -0500

   use SolarMutexGuard to guard the SolarMutex
===== bootstrap =====
commit 09243b571ef85a77ce5f76eed4b9f5d7cea16d61
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:14:13 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually
===== calc =====
commit cfe3128ea5689d1a1539f50994c98e324f8de56d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:15:13 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit f5aae02fc75814fe8f54345adc06276bd00d4c21
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:20:01 2010 -0500

   merge vosremoval-reference.diff

commit ccb5d7fcc1521348bd1d42a35b85a31400379e11
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:22:13 2010 -0500

   Use a SolarMutexGuard rather that direct acquire/release on the SolarMutex

commit 548db1dced20c99d75611e25c4b5729766b41eb1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:20:56 2010 -0500

   Replace a suspicious Guard on a solar mutex.

   This site use a OClearableGuard that is being converted to a SolarMutexGuard
   Guard will do... What is suspicious is the point where it is cleared.
   It seems that it is way to early to serve its declared purpose.

commit 52d14efd1cf18656dcddec5e6468d4a934cb5e3c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:18:02 2010 -0500

   replace ScUnoGuard by SolarMutexGuard

   ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex().
   This is now provided by the class SolarMutexGuard.

commit c382d82381cbf69cc930f05321278b483abc53a3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 01:41:46 2010 -0500

   use SolarMutexGuard to guard the SolarMutex
===== components =====
commit c439041d0ed166fc586b140284aa54c73a06bce6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 04:30:41 2010 -0500

   migrate vos::OModule to osl:Module

commit f8802b92d4c10092f23ba19fce17306fb84fff54
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:15:49 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit fb5f1c44fc068f86b44ed23cdc05be5a83a4c916
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:18:51 2010 -0500

   merge vosremoval-reference.diff

commit 3eac7d8aa940fef1234e3ae6bd43cadda6fbc4af
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:03:58 2010 -0500

   migrate use of OClearableGuard(SolarMutex) to SolarMutexGuard

   3 helper class and a site were using OClearableGuard on the SolarMutex
   None of these actually needed the Clearable feature, so
   they were replaced by a simple SolarMutexGuard.

commit 755807090d1a5e6d679763891034d1856e62bf6b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 14:00:57 2010 -0500

   remove the class TLBSolarMutex and use SolarMutexGuard instead

   The class TBLSolarMutex is a wrapper guard arounf the SolarMutex.
   the class SolarMutexGuard already provide this function.

commit 29b75b7e833f545e8a680ff5a8dab90143e4cd8f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 13:46:51 2010 -0500

   remove the class ALBSolarGuard and replace it's use with SolarMutexGuard

   ALBSolarGuard is awrapper guard around the SolarMutex
   SolarMutexGuard provide this function now.

commit 107852407569f15472b4f5eb59b5739c5fb04b67
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 13:29:19 2010 -0500

   replace BBSolarGuard with SolarMutexGuard

   BBSloarGuard iw a simple guard wrapper around the SolarMutex.
   the generic SolarMutexGuard provide this feature.

commit 5105c45dc3bdbcc6130d49f3e2bcac3eb38b2121
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 13:27:27 2010 -0500

   forgot base clase init call

commit 8701db99d0a4f4762bfa6e5063ed68759620fe57
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 08:35:22 2010 -0500

   replace the now superfluous TCSolarGuard with SolarMutexGuard

   TCSolarGuard is a class that basically wrapped a Guard around
Application::GetSolarMutex()
   This function is now provided directly by the SolarMutexGuard class.

commit 5be931acf48e436bf3cea239347e0de645b7e35e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 04:35:41 2010 -0500

   use SolarMutexGuard to guard the SolarMutex

commit 1509f022211cda3e1b84c3183fef7a29389912f6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 22:07:16 2010 -0500

   merge vosremoval-pipe.diff

commit 736414e3fe3b850a86de211a4eaa4ca026d2e186
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 20:57:51 2010 -0500

   merge vosremoval-timer.diff

commit 6162f3ea420f26a5e4910ea3b5bde1becce885e8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 16:11:20 2010 -0500

   merge vosremoval-conditn patch
===== extensions =====
commit c999e24ca5dcdb6ce37ad7a13fb3bac493247859
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:41:25 2010 -0500

   replace a residual use of vos::TTimeValue by salhelper::TTimeValue

commit 84c7ae3cf74d5231045088042713b3868e2f9605
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 20:57:51 2010 -0500

   merge vosremoval-timer.diff
===== extras =====
===== filters =====
commit df3731fe7916a0e3ab58d38d8fce3b04e4b33178
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:49:49 2010 -0500

   migrate vos::OModule to osl:Module

commit a84d6c919edf2f4f1f42415a513e92a00b114831
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:16:59 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit 0ba60084ca9f341d1235521cccc2e7116dcce2e0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:12:33 2010 -0500

   merge vosremoval-reference.diff

commit 06b292c3e38b8df9f0137798175854ee335d720b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 23:10:04 2010 -0500

   replace a pair acquire/release on the SolarMutex with a SolarMutexGuard

commit 2c6f8f314985cd9bdf065918f0c49c3287dfbe8c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 14:59:39 2010 -0500

   Use SolarMutexGuard where appropriate

commit 5a5469675887504c55309fecdc03a02a338514da
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 14:55:48 2010 -0500

   Remove the class ScUnoGuard and replace with SolarMutexGuard

   ScUnoGuard is a guard wrapper around the SolarMutex.
   SolarMutexGuard provide that service.

commit 17083f8c8980ec0a0b90c5d0e2e864f6dc130967
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 04:34:50 2010 -0500

   use SolarMutexGuard to guard the SolarMutex

commit c03a665225860a4efc9ddaa5a582643a061c9fc7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 00:53:55 2010 -0500

   merge vosremoval-security patch
===== help =====
===== impress =====
commit cd91f2bfe9c5d6f8e00f2b10ee870e6aacba0c3c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:50:23 2010 -0500

   migrate vos::Omodule to osl:Module

commit aff382807498a07defc76d85cc76c9c63d821117
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:17:28 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit 6c34db28e1c353e8f8d5b35eb2b9cc09ad7bd5a6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:11:00 2010 -0500

   merge vosremoval-reference.diff

commit dec2a021b1d80e89e29cd39e858ab5b2d5ca8a67
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 23:10:46 2010 -0500

   replace a pair acquire/release on the SolarMutex by a SolarMutexGuard

commit 03a9f2c99dea609d7b35262dc0b63c62f6329382
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 02:37:50 2010 -0500

   use SolarMutexGuard to guard the SolarMutex
===== libs-core =====
commit 680553f274c62dc0217eb1520ee6554819ec3667
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:50:58 2010 -0500

   migrate vos::OModule to osl:Module

commit 47c4bb6b85f65e57b2a55f89129e28e062c8cb74
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:18:35 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit cff87237eed267eceadfd7e627228f9ab17bcc17
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 12:10:06 2010 -0500

   merge vosremoval-reference.diff

commit 7ac0eb709e61579c0236ebaed9b0a17ebb993ab7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 23:11:47 2010 -0500

   replace a OClareableGuard on the SolarMutex by a SolarClearableMutex

commit 6fbd04aaaf74a98a819665b181a7ea0be9e6ecdb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:09:00 2010 -0500

   convert OClearableGuard(SolarMutex) to SolarMutex(Clearable)Guard.

   Most OClearableGuard of the Solar Mutex could be converted
   to a simple SolarMutexGuard.
   a couple of site were converted to a SolarMutexClearableGuard,
   were converting to a SolarMutexGuard would have made the code more
   convoluted.

commit 38fd87150a7a2dfb25d5bd5a3b6ae6bb16df2207
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 16:43:16 2010 -0500

   Use SolarMutexGuard where appropriate

commit c3af36248dde7be796c317a7c75417e950598f21
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 02:47:36 2010 -0500

   use SolarMutexGuard to guard the SolarMutex

commit 95669b854f6ebd1e25d1c132008d5832692a8da7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 22:07:16 2010 -0500

   merge vosremoval-pipe.diff

commit 72aa147a6e94c477e7ab2dcca22c2960c30510a7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 21:03:18 2010 -0500

   merge vosremoval-timer.diff

commit 0bd2b6e0f0afa1781388afc1069f7d74a15907c9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 01:26:23 2010 -0500

   merge vosremoval-signal patch

commit 669d1cdc3ddae8a373ff7d579c07fa254deeede9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 00:53:56 2010 -0500

   merge vosremoval-security patch
===== libs-extern =====
===== libs-extern-sys =====
===== libs-gui =====
commit f02552db50a2f65dee7208facc3605c99ff7014d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 11:11:55 2010 -0500

   fix missing vos::Guard creeping back-up after rebase

commit 957eaa02c32ce7895b814bc44220a1c5a19250a0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 04:45:26 2010 -0500

   fix a mishap during the OGuard migration for aqua.

commit 9c323ffb4463178d245ce2bf2011a13d9e80ab51
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:47:46 2010 -0500

   remove vos::OModule

commit a3042c0e6b3845a7e95f160921fdafb23ba8cf3b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:20:00 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit 728fa09fb6ca1499d4827065f842bb8ee834193c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 11:54:41 2010 -0500

   merge vosremoval-reference.diff

commit 63ebf6d5ffa2aaf99e74dd6b55e7544319e41498
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 23:38:23 2010 -0500

   use SolarMutexGuard instead of LocalGuard in canvas

   LocalGuard is a wrapper guard around the SolarMutex.
   SolarMutexGuard already provide this function.

commit f44a1e21225635edcf488fb3735d066315d121c2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 22:12:16 2010 -0500

   migrate OClearableGuard(SoalrMutex) to SolarMutexGuard

   Factorized the Guarded piece of code to locate the TopWindow under a
   given Point, which was repeated verbatim in 4 different functions
   That allowed as a bonus to remove the need for a ClearableGuard, and
   allow the use of a straight SolarMutexGuard.

commit 9467987a6bf0e16215003d617472c1720d41f1b5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 17:40:58 2010 -0500

   Add a new class SolarMutexClearbleGuard

   Few place in the code use vos::OClearbleGuard
aGuard(Application::GetSolarMutex());
   or something similar.
   This new class hide this ugliness into
   SolarMutexClearableGuard aGuard;

   This also has the merit to push down the vos:: dependency down
into one location
   for this kind of access, which will simplify the vos dependency removal.

commit bd29afc34adf7b69b833248f4fd1bb7999a2d037
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 14 16:43:53 2010 -0500

   Use SolarMutexGuard where appropriate

commit ea3f302580964225b9e0fdcf3a4658acfda1bf70
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 01:47:23 2010 -0500

   use SolarMutexGuard to guard the SolarMutex

commit 291134b3244b496710af468300b36c225b8855dd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Oct 12 23:56:51 2010 -0500

   create a class SolarMutexGuard to take a Guard on the SolarMutex

   Most user of OGuard, use it to guard the SolarMutex.
   using something like
   vos::OGuard aGuard(Application::GetSolarMutex())

   Which will now be written
   vcl::SolarMutexGuard aGuard;

   This will also, as a side effect remove the use of vos::Guard in many
   sources, simplifying the migration out of ::vos

commit ce60fa6e8bd3bc3c7139e1d6460f10598b12506f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 22:07:17 2010 -0500

   merge vosremoval-pipe.diff

commit 0e03d2c308e177dbf4bf85134edfc41e2c115561
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 20:57:53 2010 -0500

   merge vosremoval-timer.diff

commit 45618623601cf3c886bd3e1de54de4f3b05bff52
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 16:12:59 2010 -0500

   merge vosremoval-conditn patch

commit 95d8c1b2ca054251fff8c45dc04071e26ca02daf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 01:26:24 2010 -0500

   merge vosremoval-signal patch

commit 324a27adbc03de8c2962ea000cec762d78670583
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 00:53:57 2010 -0500

   merge vosremoval-security patch
===== postprocess =====
===== sdk =====
===== testing =====
===== ure =====
commit 1b4a25d8cdd47da738aef341e8871472de9b379b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:38:17 2010 -0500

   kill bonobo-related code in the codemaker

commit 746edc1909490335fec9a44db14d2b69c67bc52a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:21:22 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit f5ee02cf4043ff0332780c19484ff8f042bf87e9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 01:56:29 2010 -0500

   Create an abstract interface to be used to implement a SolarMutex

commit 53aa2631927c29c9e7f3f183754f96bb2b07edc5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 21:06:25 2010 -0500

   merge vosremoval-timer.diff
===== writer =====
commit abfd817b49b757e8e1e4b215d4a6c90ed21c1deb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:22:02 2010 -0500

   merge vosremoval-mutex.diff

   In practice the changeset is 'inspired' by vosremoval-mutex.diff
   but was essentially redone manually

commit 56fa34307c51b8dad5479d9698d0233752eda5d1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Oct 15 11:44:38 2010 -0500

   merge vosremoval-reference.diff

commit 1d88bfa001c21d82c7423e622afb41e46a14b869
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 13 01:44:10 2010 -0500

   use SolarMutexGuard to guard the SolarMutex


Norbert


More information about the LibreOffice mailing list