diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:36:50 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:36:50 +0000 |
commit | f685b850b01a69ea6764841e0ec0a23a7be0fb1b (patch) | |
tree | 05356f0463fb00ddd25a9b400462d3202cf7df5c /sd/source/ui/slidesorter/view | |
parent | 160c034f1920499a77f67efe35b7a61c8a9f5c0c (diff) |
INTEGRATION: CWS hub01 (1.5.324); FILE MERGED
2008/06/18 20:41:31 thb 1.5.324.2: RESYNC: (1.5-1.7); FILE MERGED
2008/01/23 02:13:14 hub 1.5.324.1: Fix a build warning about empty else statement (gcc 4.2.1)
Diffstat (limited to 'sd/source/ui/slidesorter/view')
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 30d1fcb37d3f..a422f4031eae 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SlsFontProvider.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,8 @@ FontProvider& FontProvider::Instance (void) mpInstance = pInstance; } } - else { + else + { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } |