diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:35:16 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:35:16 +0000 |
commit | 2864db07f74b5b8ad4d4b82a69beaec3d5b5e365 (patch) | |
tree | 83f9024bccb242b52898d903e1e01284a2d7e3b1 /ucb | |
parent | dacb24940bdd8b638a5a2b3e16ea3f35a5fc2ffc (diff) |
INTEGRATION: CWS hr50 (1.13.66); FILE MERGED
2008/03/05 14:22:23 hr 1.13.66.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 6a6cd8fe2c85..908d7310889b 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tdoc_content.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -278,8 +278,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() pFolderTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } else { @@ -309,8 +310,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() pDocumentTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } return (*pCollection).getTypes(); |