diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:34:59 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:34:59 +0000 |
commit | dacb24940bdd8b638a5a2b3e16ea3f35a5fc2ffc (patch) | |
tree | 56d0f687e651f4b5a52f9db518f585c40bff3c89 /ucb | |
parent | 0ce998b425533b3e27b9537f30a9accff4ecc2fa (diff) |
INTEGRATION: CWS hr50 (1.56.66); FILE MERGED
2008/03/05 14:17:57 hr 1.56.66.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index c8d3d671c8ae..f06618b702d3 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pkgcontent.cxx,v $ - * $Revision: 1.58 $ + * $Revision: 1.59 $ * * This file is part of OpenOffice.org. * @@ -341,8 +341,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() pFolderTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } else { @@ -372,8 +373,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() pDocumentTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } return (*pCollection).getTypes(); |