diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:37:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:37:02 +0000 |
| commit | 093af7a89946517fefb9cd7353fefd5c17388fbe (patch) | |
| tree | 4aae3d23ff23ed27c1a29d03a76186bbab19fcdb /sd/source/ui/toolpanel/controls/MasterPageObserver.cxx | |
| parent | f685b850b01a69ea6764841e0ec0a23a7be0fb1b (diff) | |
INTEGRATION: CWS hub01 (1.7.130); FILE MERGED
2008/06/18 20:41:54 thb 1.7.130.2: RESYNC: (1.7-1.9); FILE MERGED
2008/01/23 02:13:13 hub 1.7.130.1: Fix a build warning about empty else statement (gcc 4.2.1)
Diffstat (limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPageObserver.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 1923bef28776..7e0c3b2887c0 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MasterPageObserver.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -131,7 +131,8 @@ MasterPageObserver& MasterPageObserver::Instance (void) Implementation::mpInstance = pInstance; } } - else { + else + { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } |